widget: Remove gtk_widget_set_allocation

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index be34e70dbdb351ed1df534096490847218816d0b..04704a4b5ca89f115d499a7a3f562ece144fe9dc 100644 (file)
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -4611,7 +4611,6 @@ gtk_cairo_transform_to_window
 gtk_widget_get_allocated_width
 gtk_widget_get_allocated_height
 gtk_widget_get_allocation
-gtk_widget_set_allocation
 gtk_widget_get_allocated_baseline
 gtk_widget_get_allocated_size
 gtk_widget_get_clip

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 649edb3844db56f862cd2e0c9fd15af1b75caf16..57c8a64f9edf02b81fe9583e04cd2a311ec702b2 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -5578,7 +5578,8 @@ gtk_widget_size_allocate_with_baseline (GtkWidget     *widget,
 
 
   /* Set the widget allocation to real_allocation now, pass the smaller allocation to the vfunc */
-  gtk_widget_set_allocation (widget, &real_allocation);
+  priv->allocation = real_allocation;
+  priv->clip = real_allocation;
 
   style = gtk_css_node_get_style (priv->cssnode);
   get_box_margin (style, &margin);
@@ -13430,8 +13431,6 @@ gtk_widget_get_clip (GtkWidget     *widget,
  *
  * Sets the widget’s clip.  This must not be used directly,
  * but from within a widget’s size_allocate method.
- * It must be called after gtk_widget_set_allocation() (or after chaining up
- * to the parent class), because that function resets the clip.
  *
  * The clip set should be the area that @widget draws on. If @widget is a
  * #GtkContainer, the area must contain all children's clips.
@@ -13501,8 +13500,7 @@ gtk_widget_set_clip (GtkWidget           *widget,
  * This is a convenience function for gtk_widget_set_clip(), if you
  * just want to set the clip for @widget based on its allocation,
  * CSS properties and - if the widget is a #GtkContainer - its
- * children. gtk_widget_set_allocation() must have been called
- * and all children must have been allocated with
+ * children. All children must have been allocated with
  * gtk_widget_size_allocate() before calling this function.
  * It is therefore a good idea to call this function last in
  * your implementation of GtkWidget::size_allocate().
@@ -13692,39 +13690,6 @@ gtk_widget_get_margin_allocation (GtkWidget     *widget,
   allocation->height -= margin.top + margin.bottom;
 }
 
-/**
- * gtk_widget_set_allocation:
- * @widget: a #GtkWidget
- * @allocation: a pointer to a #GtkAllocation to copy from
- *
- * Sets the widget’s allocation.  This should not be used
- * directly, but from within a widget’s size_allocate method.
- *
- * The allocation set should be the “adjusted” or actual
- * allocation. If you’re implementing a #GtkContainer, you want to use
- * gtk_widget_size_allocate() instead of gtk_widget_set_allocation().
- * The GtkWidgetClass::adjust_size_allocation virtual method adjusts the
- * allocation inside gtk_widget_size_allocate() to create an adjusted
- * allocation.
- *
- * Since: 2.18
- */
-void
-gtk_widget_set_allocation (GtkWidget           *widget,
-                           const GtkAllocation *allocation)
-{
-  GtkWidgetPrivate *priv;
-
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (_gtk_widget_get_visible (widget) || _gtk_widget_is_toplevel (widget));
-  g_return_if_fail (allocation != NULL);
-
-  priv = widget->priv;
-
-  priv->allocation = *allocation;
-  priv->clip = *allocation;
-}
-
 /**
  * gtk_widget_get_allocated_width:
  * @widget: the widget to query

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index da5583f6d0078f8b80372c34758c8974cc8c6009..175c58eb3eb363a44b2b795304b97a548ee87ebd 100644 (file)
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -759,9 +759,6 @@ void                  gtk_widget_get_allocated_size     (GtkWidget     *widget,
 GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_get_allocation         (GtkWidget     *widget,
                                                          GtkAllocation *allocation);
-GDK_AVAILABLE_IN_ALL
-void                  gtk_widget_set_allocation         (GtkWidget     *widget,
-                                                         const GtkAllocation *allocation);
 GDK_AVAILABLE_IN_3_14
 void                  gtk_widget_set_clip               (GtkWidget     *widget,
                                                          const GtkAllocation *clip);